fix preprocessor conditional confusion. (G_OS_UNIX/G_OS_WIN32 stuff)

Tue Dec 16 15:01:10 2003  Manish Singh  <yosh@gimp.org>

        * gtk/gtkfilechooserwidget.c: fix preprocessor conditional confusion.
        (G_OS_UNIX/G_OS_WIN32 stuff)

diff --git a/ChangeLog b/ChangeLog
index 0db395d1a1edd6baa1f0aba4d66cdd566612a0ba..37c51ce5f0042f347d9d154e80d4a65e9c2ccd79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 16 15:01:10 2003  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkfilechooserwidget.c: fix preprocessor conditional confusion.
+       (G_OS_UNIX/G_OS_WIN32 stuff)
+
 Tue Dec 16 01:46:46 2003  Matthias Clasen  <maclas@gmx.de>
 
        Do not interpret distant clicks as double-clicks  (#116541,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0db395d1a1edd6baa1f0aba4d66cdd566612a0ba..37c51ce5f0042f347d9d154e80d4a65e9c2ccd79 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Dec 16 15:01:10 2003  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkfilechooserwidget.c: fix preprocessor conditional confusion.
+       (G_OS_UNIX/G_OS_WIN32 stuff)
+
 Tue Dec 16 01:46:46 2003  Matthias Clasen  <maclas@gmx.de>
 
        Do not interpret distant clicks as double-clicks  (#116541,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0db395d1a1edd6baa1f0aba4d66cdd566612a0ba..37c51ce5f0042f347d9d154e80d4a65e9c2ccd79 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Dec 16 15:01:10 2003  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkfilechooserwidget.c: fix preprocessor conditional confusion.
+       (G_OS_UNIX/G_OS_WIN32 stuff)
+
 Tue Dec 16 01:46:46 2003  Matthias Clasen  <maclas@gmx.de>
 
        Do not interpret distant clicks as double-clicks  (#116541,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0db395d1a1edd6baa1f0aba4d66cdd566612a0ba..37c51ce5f0042f347d9d154e80d4a65e9c2ccd79 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Dec 16 15:01:10 2003  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkfilechooserwidget.c: fix preprocessor conditional confusion.
+       (G_OS_UNIX/G_OS_WIN32 stuff)
+
 Tue Dec 16 01:46:46 2003  Matthias Clasen  <maclas@gmx.de>
 
        Do not interpret distant clicks as double-clicks  (#116541,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0db395d1a1edd6baa1f0aba4d66cdd566612a0ba..37c51ce5f0042f347d9d154e80d4a65e9c2ccd79 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Dec 16 15:01:10 2003  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkfilechooserwidget.c: fix preprocessor conditional confusion.
+       (G_OS_UNIX/G_OS_WIN32 stuff)
+
 Tue Dec 16 01:46:46 2003  Matthias Clasen  <maclas@gmx.de>
 
        Do not interpret distant clicks as double-clicks  (#116541,

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 9937607adc6e71ce6a08ce5b75d89a4f99be1688..f0cd8e8188bc6e5ba78f7ca4c396577a79931b5e 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -21,12 +21,13 @@
 #include "gtkfilechooserwidget.h"
 #include "gtkfilechooserdefault.h"
 #include "gtkfilechooserutils.h"
-#ifdef G_OS_UNIX
+#include "gtktypebuiltins.h"
+
+#if defined (G_OS_UNIX)
 #include "gtkfilesystemunix.h"
-#else if defined G_OS_WIN32
+#elif defined (G_OS_WIN32)
 #include "gtkfilesystemwin32.h"
 #endif
-#include "gtktypebuiltins.h"
 
 struct _GtkFileChooserWidgetPrivate
 {
@@ -135,9 +136,9 @@ gtk_file_chooser_widget_constructor (GType                  type,
 
   if (!priv->file_system)
     {
-#if defined G_OS_UNIX
+#if defined (G_OS_UNIX)
       priv->file_system = gtk_file_system_unix_new ();
-#else if defined G_OS_WIN32
+#elif defined (G_OS_WIN32)
       priv->file_system = gtk_file_system_win32_new ();
 #endif
     }